Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cloudwatch: Add back support for old Log Group picker #73524

Merged
merged 4 commits into from
Aug 31, 2023

Conversation

sarahzinger
Copy link
Member

What is this feature?

When we Added Cross Account Observability to Cloudwatch Logs, we switched to a new log group picker.

This log group picker lets users select Log Groups across multiple accounts if available, and rather than save them by Log Group Name, we saved them by ARN, because Log Group Names do not have to be unique across aws accounts.

After some testing, we decided it seemed to be working well for users using Cross Account Observability and users who were not so we switched all users to the new Log Group Picker.

Unfortunately we learned after doing so that the aws api to query across log groups using log group arns is not supported in Gov Cloud just yet, and may not for sometime. This PR brings back the old Log Group Picker. Most users will continue to see the new Log Group Picker, however if users would like to revert to the old one, they now can by setting a feature flag in their custom.ini (or by making a support request if they are in Grafana Cloud)

[feature_toggles]
cloudWatchCrossAccountQuerying = false

Why do we need this feature?

To let AWS Gov Cloud upgrade to more recent versions of Grafana while still using Cloudwatch Logs.

Who is this feature for?

AWS Gov Cloud users

Which issue(s) does this PR fix?:

Fixes #71982

Special notes for your reviewer:

Please check that:

  • It works as expected from a user's perspective.
  • If this is a pre-GA feature, it is behind a feature toggle.
  • The docs are updated, and if this is a notable improvement, it's added to our What's New doc.

logGroupLimit = intLimit
}

var response *cloudwatchlogs.DescribeLogGroupsOutput = nil
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a reason this is a var on this line instead of it being on line 310?

response, err := logsClient.DescribeLogGroups(input)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no reason I can think of! I just copy and 🍝 from what we used to have but I like the suggestion! Changing now :)

Copy link
Contributor

@iwysiu iwysiu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! I assume you tried it with a CloudWatch query that returns data (turns out I don't have one locally)

@sarahzinger sarahzinger force-pushed the sarahzinger/bring-back-old-cloudwatch-logs-selector branch from b0d7c2a to de4ee7f Compare August 31, 2023 13:06
@sarahzinger sarahzinger merged commit 34a831c into main Aug 31, 2023
15 checks passed
@sarahzinger sarahzinger deleted the sarahzinger/bring-back-old-cloudwatch-logs-selector branch August 31, 2023 14:13
chauchausoup pushed a commit to chauchausoup/grafana that referenced this pull request Sep 15, 2023
Cloudwatch: Add back support for old Log Group picker behind feature toggle. 

Fixes issue for aws gov cloud users
sarahzinger added a commit that referenced this pull request Sep 18, 2023
Cloudwatch: Add back support for old Log Group picker behind feature toggle.

Fixes issue for aws gov cloud users
sarahzinger added a commit that referenced this pull request Sep 19, 2023
* Cloudwatch: Add back support for old Log Group picker (#73524)
rwwiv pushed a commit that referenced this pull request Oct 2, 2023
Cloudwatch: Add back support for old Log Group picker behind feature toggle. 

Fixes issue for aws gov cloud users
@zerok zerok modified the milestones: 10.2.x, 10.2.0 Oct 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cloudwatch Logs: Bring back support for old Cloudwatch Logs picker
4 participants